bitkeeper revision 1.1389.14.2 (4280b79axJTjlpP4pLQJ2vgfWKJ0og)

smpboot_hooks.h, smpboot.c:
  Also setup IO APIC when running an SMP guest.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
index ec1b3b9dead695aec97d5b6b94b583787539d867..bbe096394244600866cc46c38d0f6a6506fe08b3 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -1267,9 +1267,11 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
 #if 0
        if (nmi_watchdog == NMI_LOCAL_APIC)
                check_nmi_watchdog();
+#endif
 
        smpboot_setup_io_apic();
 
+#if 0
        setup_boot_APIC_clock();
 
        /*

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
index 421a81f17beaf849815f4108997a5011c2c08a56..7479f82686bbcb462f856978cc9332215eaec3fd 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
@@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_reset_vector(void)
 
 static inline void smpboot_setup_io_apic(void)
 {
-#if 1
-       printk("smpboot_setup_io_apic\n");
-#else
        /*
         * Here we can be sure that there is an IO-APIC in the system. Let's
         * go and set it up:
         */
        if (!skip_ioapic_setup && nr_ioapics)
                setup_IO_APIC();
-#endif
 }
 
 

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
index 421a81f17beaf849815f4108997a5011c2c08a56..7479f82686bbcb462f856978cc9332215eaec3fd 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
@@ -43,16 +43,12 @@ static inline void smpboot_restore_warm_reset_vector(void)
 
 static inline void smpboot_setup_io_apic(void)
 {
-#if 1
-       printk("smpboot_setup_io_apic\n");
-#else
        /*
         * Here we can be sure that there is an IO-APIC in the system. Let's
         * go and set it up:
         */
        if (!skip_ioapic_setup && nr_ioapics)
                setup_IO_APIC();
-#endif
 }